From 5d0f135265b8da4ee037ad25ee07f801b873bbd8 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 15 Dec 2017 11:14:31 +0100 Subject: [PATCH] x86: remove _PAGE_PSE check from get_page_from_l2e() With L2_DISALLOW_MASK containing _PAGE_PSE unconditionally as of commit 56fff3e5e9 ("x86: nuke PV superpage option and code") there's no point anymore in separately checking for the bit. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 3eb338036e..11a21c254c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1113,15 +1113,11 @@ get_page_from_l2e( return -EINVAL; } - if ( !(l2e_get_flags(l2e) & _PAGE_PSE) ) - { - rc = get_page_and_type_from_mfn(_mfn(mfn), PGT_l1_page_table, d, 0, 0); - if ( unlikely(rc == -EINVAL) && get_l2_linear_pagetable(l2e, pfn, d) ) - rc = 0; - return rc; - } + rc = get_page_and_type_from_mfn(_mfn(mfn), PGT_l1_page_table, d, 0, 0); + if ( unlikely(rc == -EINVAL) && get_l2_linear_pagetable(l2e, pfn, d) ) + rc = 0; - return -EINVAL; + return rc; } -- 2.30.2